Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Rename Color to LegacyColor" #243

Merged
merged 1 commit into from
Mar 1, 2024
Merged

Conversation

Nilirad
Copy link
Owner

@Nilirad Nilirad commented Mar 1, 2024

Reverts #240

LegacyColor has been removed. Reverting to make #242 easier to merge.

@Nilirad Nilirad merged commit 2644da3 into bevy-main Mar 1, 2024
0 of 2 checks passed
Nilirad added a commit that referenced this pull request Jul 5, 2024
Nilirad added a commit that referenced this pull request Jul 5, 2024
* Resolve merge conflicts

* Use GitHub Actions config from master branch (#217)

* Use GitHub Actions config from master branch

* Fix formatting

* Fix deprecation warnings on add_plugin

* Fix CI (#218)

* Fix shader (#219)

* Use `SpatialBundle` (#221)

* Use `MaterialMesh2dBundle` with `ColorMaterial` (#224)

* Use `MaterialMesh2dBundle` with `ColorMaterial`

* clippy

* Fix green channel filtering bug

* Clippy again

* Fix CI (#237)

* Rename `Color` to `LegacyColor` (#240)

* Rename usages of `Color` to `LegacyColor`

* Fix tests

* Revert "Rename `Color` to `LegacyColor` (#240)" (#243)

This reverts commit 6918ca1.

* Migrate to `bevy_color` (#242)

* Migrate to `bevy_color`

The example `dynamic_shape` does not work.

* Update palette color usage

* Fix tests

* Fix CI (#244)

* Fix CI

* Update to bevy 0.14 (#247)

* update to bevy 0.14.0-rc.3

* Depend on `main` branch of Bevy

---------

Co-authored-by: Nilirad <gisquerin@gmail.com>

* Fix CI (#248)

* Update Cargo.toml

* Update documents

---------

Co-authored-by: Alix Bott <bott.alix@gmail.com>
Co-authored-by: a <52638772+aMyTimed@users.noreply.github.com>
@Nilirad Nilirad deleted the revert-240-fix-ci branch August 19, 2024 08:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant